Merge branch 'master-v3.0' into saclay-v3.0

Conflicts:
	static/saclay/css/styles.css
	static/saclay/js/interface.js
	templates/chimere/blocks/map.html

5 files changed, 333 insertions, 213 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index df4de6e..41e09b4 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -50,7 +50,7 @@ a, a:link, a:visited,
 #footer .map-footer a:visited,
 #welcome .footer,
 caption{
-    color:#9da1a1;
+    color:#444;
 }
 
 /* alternat link */
@@ -98,10 +98,10 @@ body, #content,
 
 /* alternative background */
 #layer_selection #layer_list li.head,
-.welcome-dialog h2, #footer-panel,
+.welcome-dialog h2,
 ul#multimedia_list_content li, #welcome .footer,
 #action{
-    background-color:#d6d6c4;
+    background-color: #eaeaea;
 }
 
 #detail_footer{
@@ -487,20 +487,6 @@ a#ui-active-menuitem.ui-state-hover{
     background-image:none;
 }
 
-#haystack-search-page,
-#haystack-search{
-    width:35px;
-    height:28px;
-    background-color: #fff;
-    border: 1px solid #ddd;
-    vertical-align:top;
-}
-
-#haystack-search-page .action-label,
-#haystack-search .action-label{
-    display: none;
-}
-
 #id_welcome_search{
     height: 26px;
     border: 1px solid #ccc;
@@ -783,6 +769,7 @@ a#ui-active-menuitem.ui-state-hover{
     padding:0;
     background-image:url('../images/background-top.png');
     background-repeat:repeat-x;
+    display: none;
 }
 
 #header{
@@ -997,7 +984,7 @@ ul#action{
 */
 
 #main-map{
-    top:26px;
+    top: 0;
     bottom:0;
     height:auto;
 }
@@ -1077,24 +1064,51 @@ div#sidebar{
 
 div#sidebar{
     z-index:7;
-    width:295px;
-    top:26px;
+    width:297px;
+    top: 0;
     position:absolute;
     bottom:0;
     padding-right:15px;
+    border-width:0 1px;
+}
+
+div#sidebar-container{
+    background-color: white;
+    width: 100%;
+    height: 100%;
+    background-image:url('../images/gradient.png');
+    background-repeat:repeat-x;
+    background-position:left bottom;
 }
 
 div#action-panel{
-    border-width:0;
-    border-right-width:1px;
-    border-style:solid;
-    z-index:10;
-    height:60px;
-    width:283px;
-    background-image:url(../images/background-small.png) ;
-    background-repeat:repeat;
-    background-position:center;
-    border-right:1px solid;
+    display: none;
+}
+
+.action-button:hover{
+    cursor: pointer;
+    color: #999;
+}
+
+.action-button{
+    position: absolute;
+    background-color: #fff;
+    z-index: 10;
+    padding: 10px;
+    border-radius: 20px;
+    width: 40px;
+    height: 40px;
+    text-align: center;
+}
+
+#edit-button{
+    top: 20px;
+    left: 300px;
+}
+
+#routing-button{
+    bottom: 40px;
+    right: 40px;
 }
 
 div#panel{
@@ -1103,28 +1117,31 @@ div#panel{
     z-index:10;
     max-height:none;
     padding:0;
+    padding-top: 170px;
     right:auto;
     bottom:26px;
-    top:60px;
+    top: 0;
     border-width:0 1px;
     background-image:url('../images/logo.png');
     background-repeat:repeat-x;
-    background-position:left bottom;
+    background-position:left top;
+    background-color: transparent;
     overflow-x:hidden;
-    border-right:1px solid;
+    background-color: #fff;
 }
 
 #footer-panel{
     text-align:center;
-    padding:3px;
     bottom:0;
     position:absolute;
-    border-right:1px solid #000;
-    border-left:0 solid transparent;
     width: 283px;
     height: 26px;
+    font-size: 0.88em;
 }
 
+#footer-panel a{
+    font-variant: small-caps;
+}
 /* share toolbar */
 
 a.share_id_email_single{
@@ -1596,6 +1613,48 @@ ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
     padding:4px;
 }
 
+#search-box{
+    display: block;
+}
+
+#search-box,
+#search-nav{
+    background-color:#fff;
+}
+
+#search-form{
+    background-color: #eaeaea;
+    margin: 20px 0;
+    padding: 5px 0 5px 15px;
+    border-bottom: 0 solid transparent;
+}
+
+#search-form input{
+    border: 0;
+    background-color: #eaeaea;
+    width: 210px;
+}
+
+#haystack-search-page .action-label,
+#haystack-search .action-label{
+    display: none;
+}
+
+
+#haystack-search{
+    width:35px;
+    height:28px;
+    vertical-align:top;
+    border: 0;
+    background-color: #eaeaea;
+    border-radius: 0;
+    box-shadow: none;
+}
+
+#edit-panel {
+    padding: 25px 0;
+}
+
 #edit-panel label{
     font-size:0.9em;
 }
@@ -1667,6 +1726,45 @@ ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
     border:none;
 }
 
+#back-categories{
+    color: #60543A;
+    background-color: #eaeaea;
+    font-weight: 900;
+    padding: 0;
+    width: 282px;
+    position: fixed;
+    bottom: 26px;
+    left: 0;
+    font-family: 'Numans';
+    z-index: 10;
+    display: none;
+}
+
+#back-categories:hover{
+    cursor: pointer;
+}
+
+#back-categories .fa,
+#back-categories p{
+    display: inline-block;
+    padding: 0;
+    margin: 0;
+}
+
+#back-categories p{
+    height: 26px;
+    vertical-align: middle;
+    padding-left: 0.3em;
+}
+
+#back-categories .fa{
+    font-size: 2em;
+    padding-top: 4px;
+    padding-left: 12px;
+}
+
+
+
 input.hasDatepicker{
     background-image:url(../images/buttons/calendar.png) ;
     background-repeat:no-repeat;
diff --git a/static/saclay/images/gradient.png b/static/saclay/images/gradient.png
new file mode 100644
index 0000000..c745816
--- /dev/null
+++ b/static/saclay/images/gradient.png
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 2c94ae4..6fdfd93 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -11,9 +11,195 @@ var init_default_message_diag = function(){
       });
 }
 
+var update_editmarker = function(){
+    $("#main-map").chimere('cleanRoute');
+    $('.map_button').hide();
+    if($('#multimedia_form').length) $('#multimedia_form').remove();
+    $('#action-edit-event').removeClass('state-active');
+    $('#action-edit-route').removeClass('state-active');
+    $('#action-edit-marker').addClass('state-active');
+    $('#frm-edit-route').hide();
+    $('#frm-edit-event').hide();
+    $('#frm-edit-marker').show();
+
+    $('#message').removeClass();
+    $('#message').addClass('alert');
+    $('#message').addClass('alert-info');
+    $('#message .content').html(msg_edit);
+    $('#message').show();
+
+    $.ajax({url: edit_url,
+            dataType: "html",
+            success: function (data) {
+                $('#frm-edit-event').html('');
+                $('#frm-edit-route').html('');
+                $('#frm-edit-marker').html(data);
+                $("#main-map").chimere('activateMarkerEdit');
+            },
+            error: function (data) {
+                $('#frm-edit-marker').html("<p class='warning'>"+
+                                    default_error_message+"</p>");
+            }
+        });
+};
+
+var update_editevent = function(){
+    $("#main-map").chimere('cleanRoute');
+    $('.map_button').hide();
+    if($('#multimedia_form').length) $('#multimedia_form').remove();
+    $('#action-edit-marker').removeClass('state-active');
+    $('#action-edit-route').removeClass('state-active');
+    $('#action-edit-event').addClass('state-active');
+    $('#frm-edit-marker').hide();
+    $('#frm-edit-route').hide();
+    $('#frm-edit-event').show();
+
+    $('#message').removeClass();
+    $('#message').addClass('alert');
+    $('#message').addClass('alert-info');
+    $('#message .content').html(msg_edit);
+    $('#message').show();
+
+    $.ajax({url: edit_event_url,
+            dataType: "html",
+            success: function (data) {
+                $('#frm-edit-marker').html('');
+                $('#frm-edit-route').html('');
+                $('#frm-edit-event').html(data);
+                $("#main-map").chimere('activateMarkerEdit');
+            },
+            error: function (data) {
+                $('#frm-edit-event').html("<p class='warning'>"+
+                                    default_error_message+"</p>");
+            }
+        });
+};
+
+var update_editroute = function(){
+    $('.map_button').show();
+    if($('#multimedia_form').length) $('#multimedia_form').remove();
+    $('#action-edit-marker').removeClass('state-active');
+    $('#action-edit-event').removeClass('state-active');
+    $('#action-edit-route').addClass('state-active');
+    $('#frm-edit-marker').hide();
+    $('#frm-edit-event').hide();
+    $('#frm-edit-route').show();
+    $('#chimere_itinerary').hide();
+    $('#chimere_itinerary_form').show();
+
+    $('#message').removeClass();
+    $('#message').addClass('alert');
+    $('#message').addClass('alert-info');
+    $('#message .content').html(msg_edit_route);
+    $('#message').show();
+
+    $.ajax({url: edit_route_url,
+            dataType: "html",
+            success: function (data) {
+                $('#frm-edit-marker').html('');
+                $('#frm-edit-event').html('');
+                $('#frm-edit-route').html(data);
+                $("#main-map").chimere('cleanMarker');
+                $("#main-map").chimere('activateRouteEdit');
+            },
+            error: function (data) {
+                $('#frm-edit-route').html("<p class='warning'>"+
+                                    default_error_message+"</p>");
+            }
+        });
+};
+
+var routing_panel_open = function(){
+    $('#frm_categories').hide();
+    $('#search-box').hide();
+    $('#frm-edit-marker').hide();
+    $('#chimere_itinerary_panel').show();
+    $('#back-categories').show();
+};
+
+var category_panel_open = function(){
+    $('#chimere_itinerary_panel').hide();
+    $('#search-result').hide();
+    $('#frm-edit-marker').hide();
+    $('#back-categories').hide();
+    $('#search-box').show();
+    $('#frm_categories').show();
+};
+
+var search_panel_open = function(){
+    $('#chimere_itinerary_panel').hide();
+    $('#frm_categories').hide();
+    $('#frm-edit-marker').hide();
+    $('#search-box').show();
+    $('#search-result').show();
+    $('#back-categories').show();
+};
+
+var edit_panel_open = function(){
+    update_editmarker();
+    $('#chimere_itinerary_panel').hide();
+    $('#search-box').hide();
+    $('#search-result').hide();
+    $('#frm_categories').hide();
+    $('#edit-actions').show();
+    $('#back-categories').show();
+};
+
+// LIB iOS
+var connectWebViewJavascriptBridge = function(callback) {
+    if (window.WebViewJavascriptBridge) {
+        callback(WebViewJavascriptBridge);
+    } else {
+    document.addEventListener('WebViewJavascriptBridgeReady', function() {
+            callback(WebViewJavascriptBridge);
+        }, false);
+    }
+};
 
 $(function(){
     init_default_message_diag();
+
+    $('#action-routing').click(routing_panel_open);
+    $('#routing-button').click(routing_panel_open);
+    $('#action-categories').click(category_panel_open);
+    $('#action-search').click(search_panel_open);
+    $('#edit-button').click(edit_panel_open);
+    $('#back-categories').click(category_panel_open);
+
+    $('#sidebar-handler-hide').click(function(){
+        $('#sidebar').hide();
+        // Added for mobile - START //
+        // iOS
+        connectWebViewJavascriptBridge(
+            function(bridge) {
+                  if(!bridge){
+                        bridge.init(function(message, responseCallback) {
+                           if (responseCallback) {
+                               responseCallback("Right back atcha");
+                           }
+                           });
+                    }
+                bridge.send('sidebarHide');
+        });
+    });
+
+    $('#sidebar-handler-show').click(function(){
+        $('#sidebar').show();
+        // Added for mobile - START //
+        // iOS
+        connectWebViewJavascriptBridge(
+            function(bridge) {
+                  if(!bridge){
+                        bridge.init(function(message, responseCallback) {
+                           if (responseCallback) {
+                               responseCallback("Right back atcha");
+                           }
+                           });
+                    }
+                bridge.send('sidebarShow');
+        });
+    });
+
     $('#message').hide();
 
     $("[data-hide]").on("click", function(){
@@ -24,104 +210,6 @@ $(function(){
         $(".buttonset label").removeAttr("aria-pressed");
         $(this).attr("aria-pressed", 'true');
     });
-
-    var update_editmarker = function(){
-        $("#main-map").chimere('cleanRoute');
-        $('.map_button').hide();
-        if($('#multimedia_form').length) $('#multimedia_form').remove();
-        $('#action-edit-event').removeClass('state-active');
-        $('#action-edit-route').removeClass('state-active');
-        $('#action-edit-marker').addClass('state-active');
-        $('#frm-edit-route').hide();
-        $('#frm-edit-event').hide();
-        $('#frm-edit-marker').show();
-
-        $('#message').removeClass();
-        $('#message').addClass('alert');
-        $('#message').addClass('alert-info');
-        $('#message .content').html(msg_edit);
-        $('#message').show();
-
-        $.ajax({url: edit_url,
-                dataType: "html",
-                success: function (data) {
-                    $('#frm-edit-event').html('');
-                    $('#frm-edit-route').html('');
-                    $('#frm-edit-marker').html(data);
-                    $("#main-map").chimere('activateMarkerEdit');
-                },
-                error: function (data) {
-                    $('#frm-edit-marker').html("<p class='warning'>"+
-                                        default_error_message+"</p>");
-                }
-            });
-    };
-
-    var update_editevent = function(){
-        $("#main-map").chimere('cleanRoute');
-        $('.map_button').hide();
-        if($('#multimedia_form').length) $('#multimedia_form').remove();
-        $('#action-edit-marker').removeClass('state-active');
-        $('#action-edit-route').removeClass('state-active');
-        $('#action-edit-event').addClass('state-active');
-        $('#frm-edit-marker').hide();
-        $('#frm-edit-route').hide();
-        $('#frm-edit-event').show();
-
-        $('#message').removeClass();
-        $('#message').addClass('alert');
-        $('#message').addClass('alert-info');
-        $('#message .content').html(msg_edit);
-        $('#message').show();
-
-        $.ajax({url: edit_event_url,
-                dataType: "html",
-                success: function (data) {
-                    $('#frm-edit-marker').html('');
-                    $('#frm-edit-route').html('');
-                    $('#frm-edit-event').html(data);
-                    $("#main-map").chimere('activateMarkerEdit');
-                },
-                error: function (data) {
-                    $('#frm-edit-event').html("<p class='warning'>"+
-                                        default_error_message+"</p>");
-                }
-            });
-    };
-
-    var update_editroute = function(){
-        $('.map_button').show();
-        if($('#multimedia_form').length) $('#multimedia_form').remove();
-        $('#action-edit-marker').removeClass('state-active');
-        $('#action-edit-event').removeClass('state-active');
-        $('#action-edit-route').addClass('state-active');
-        $('#frm-edit-marker').hide();
-        $('#frm-edit-event').hide();
-        $('#frm-edit-route').show();
-        $('#chimere_itinerary').hide();
-        $('#chimere_itinerary_form').show();
-
-        $('#message').removeClass();
-        $('#message').addClass('alert');
-        $('#message').addClass('alert-info');
-        $('#message .content').html(msg_edit_route);
-        $('#message').show();
-
-        $.ajax({url: edit_route_url,
-                dataType: "html",
-                success: function (data) {
-                    $('#frm-edit-marker').html('');
-                    $('#frm-edit-event').html('');
-                    $('#frm-edit-route').html(data);
-                    $("#main-map").chimere('cleanMarker');
-                    $("#main-map").chimere('activateRouteEdit');
-                },
-                error: function (data) {
-                    $('#frm-edit-route').html("<p class='warning'>"+
-                                        default_error_message+"</p>");
-                }
-            });
-    };
     $("#action-news").click(function(){
         $('#news').dialog('open');
     });
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 17ecc19..26bc9bd 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -21,82 +21,6 @@ $("#{{map_id}}").show();
 
 
 <script type="text/javascript">
-    //LIB iOS
-    var connectWebViewJavascriptBridge = function(callback) {
-        if (window.WebViewJavascriptBridge) {
-            callback(WebViewJavascriptBridge);
-        } else {
-        document.addEventListener('WebViewJavascriptBridgeReady', function() {
-                callback(WebViewJavascriptBridge);
-            }, false);
-        }
-    };
-    $('#sidebar-handler-hide').click(function(){
-        $('#sidebar').hide();
-        // Added for mobile - START //
-        //iOS
-        connectWebViewJavascriptBridge(
-            function(bridge) {
-                  if(!bridge){
-                        bridge.init(function(message, responseCallback) {
-                           if (responseCallback) {
-                               responseCallback("Right back atcha");
-                           }
-                           });
-                    }
-                bridge.send('sidebarHide');
-        });
-    });
-    $('#sidebar-handler-show').click(function(){
-        $('#sidebar').show();
-        // Added for mobile - START //
-        //iOS
-        connectWebViewJavascriptBridge(
-            function(bridge) {
-                  if(!bridge){
-                        bridge.init(function(message, responseCallback) {
-                           if (responseCallback) {
-                               responseCallback("Right back atcha");
-                           }
-                           });
-                    }
-                bridge.send('sidebarShow');
-        });
-    });
-    //fin  lib ios
-    var routing_panel_open = function(){
-        $('#frm_categories').hide();
-        $('#search-box').hide();
-        $('#chimere_itinerary_panel').show();
-        $('#action-categories').removeClass('state-active');
-        $('#action-search').removeClass('state-active');
-        $('#action-routing').addClass('state-active');
-    };
-
-    $('#action-routing').click(routing_panel_open);
-
-    var category_panel_open = function(){
-        $('#chimere_itinerary_panel').hide();
-        $('#search-box').hide();
-        $('#frm_categories').show();
-        $('#action-routing').removeClass('state-active');
-        $('#action-search').removeClass('state-active');
-        $('#action-categories').addClass('state-active');
-    };
-
-    $('#action-categories').click(category_panel_open);
-
-    var search_panel_open = function(){
-        $('#chimere_itinerary_panel').hide();
-        $('#frm_categories').hide();
-        $('#search-box').show();
-        $('#action-routing').removeClass('state-active');
-        $('#action-categories').removeClass('state-active');
-        $('#action-search').addClass('state-active');
-    };
-
-    $('#action-search').click(search_panel_open);
-
     {% if single_category %}
     $(function() {$('#panel').hide()});{% endif %}
     var permalink = window.location.hash.substr(1);
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 67f44f4..ca60e34 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -3,6 +3,7 @@
 {% block extra_head %}
 {% head_jquery %}
 {% head_chimere %}
+<script src="https://use.fontawesome.com/28dbea13a1.js"></script>
 {% comment %}{% head_jme %}{% endcomment %}
 {% head_form %}
 <script src="{{ STATIC_URL }}saclay/js/jquery.form.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script>
@@ -23,6 +24,7 @@
 {% endblock %}
 {% block message_edit %}{% endblock %}
 {% block sidebar %}
+  <div id="sidebar-container">
     <div class='sidebar-handler' id='sidebar-handler-hide'>
     </div>
     <div id='action-panel'{% if has_search %} class='three'{% endif %}>
@@ -50,11 +52,11 @@
     </div>
     <div id='panel'>
         <div id='map-panel'>
+            <div id='search-box'></div>
             <form action='.' method='post' name='frm_categories' id='frm_categories'>
                 <div id='categories'>{# dynamic content #}
                 </div>
             </form>
-            <div id='search-box'></div>
             {% routing %}
         </div>
         <div id='edit-panel'>
@@ -66,10 +68,14 @@
             </div>
         </div>
     </div>
+    <div id='back-categories'>
+        <i class="fa fa-arrow-circle-left" aria-hidden="true"></i> <p>REVENIR AUX CATÉGORIES</p>
+    </div>
     <div class='footer' id='footer-panel'>
-        {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %}
-        <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
+        {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact" %}</a> | {% endif %}
+        <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a>
     </div>
+  </div>
 {% endblock %}
 {% block content %}
     <div id='category_description'>
@@ -100,6 +106,10 @@
     {% display_news news_visible %}
     {{ block.super }}
     <div id='map-shadow'></div>
+    <div id='edit-button' class="action-button">
+        <i class="fa fa-plus" aria-hidden="true"></i></div>
+    {% if itinerary_form %}<div id='routing-button' class="action-button">
+        <i class="fa fa-map-signs" aria-hidden="true"></i></div>{% endif %}
     <div id='default-message'></div>
     <a href='{% url 'chimere:extra_page' '' 'feedback' %}' id='page-feedback' class='dyn-page'>Suggestions</a>
 <script type="text/javascript">